From: mjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Date: Tue, 29 Jun 2004 12:07:38 +0000 (+0000)
Subject: bitkeeper revision 1.1026.1.3 (40e15b8axprCR5Dz4kx2nkcFCm2FZw)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~18092^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=ed6ba28a6401fff61cb7b8f1b702fce9aadf28ee;p=xen.git

bitkeeper revision 1.1026.1.3 (40e15b8axprCR5Dz4kx2nkcFCm2FZw)

Merge xenbk@gandalf:/var/bk/xeno-unstable.bk
into wray-m-3.hpl.hp.com:/home/mjw/repos-bk/xeno-unstable.bk
---

ed6ba28a6401fff61cb7b8f1b702fce9aadf28ee
diff --cc .rootkeys
index 7eff074341,91a12ae1e3..a901a1d4cd
--- a/.rootkeys
+++ b/.rootkeys
@@@ -290,9 -290,22 +291,10 @@@
  40cf2937isyS250zyd0Q2GuEDoNXfQ tools/xen/lib/xm/main.py
  40cf2937PSslwBliN1g7ofDy2H_RhA tools/xen/lib/xm/opts.py
  40cf2937Z8WCNOnO2FcWdubvEAF9QQ tools/xen/lib/xm/shutdown.py
 -40c9c469kT0H9COWzA4XzPBjWK0WsA tools/xen/netfix
  40c9c469n2RRwCmjWdjdyyVRWKmgWg tools/xen/setup.py
+ 40e15b7edWEtBf_oe3eBwGKuh1dyzQ tools/xen/vifctl
  40c9c4697z76HDfkCLdMhmaEwzFoNQ tools/xen/xend
  40cf2937dqM1jWW87O5OoOYND8leuA tools/xen/xm
 -40431ac64Hj4ixUnKmlugZKhXPFE_Q tools/xend-old/Makefile
 -4055ad95Se-FqttgxollqOAAHB94zA tools/xend-old/lib/__init__.py
 -4092738fMRGC9fFBcPRCWaJaj9U3ag tools/xend-old/lib/blkif.py
 -4055ad97wMLUj0BZT0e_T0EwQN0Bvw tools/xend-old/lib/console.py
 -4048c0ddsF0WrU7HUzTvg1MJoCIfWg tools/xend-old/lib/domain_controller.h
 -4054a301VEag2GwrBrFBna5U1BGlLA tools/xend-old/lib/main.py
 -4055ad9ah9IuC3sJT2c_gYIFY5Tw_g tools/xend-old/lib/manager.py
 -409ba2e729HhE7fEra4B5EqX-F8Xzw tools/xend-old/lib/netif.py
 -40431ac8wrUEj-XM7B8smFtx_HA7lQ tools/xend-old/lib/utils.c
 -4054a2fdkdATEnRw-U7AUlgu-6JiUA tools/xend-old/setup.py
 -4056cd26Qyp09iNoOjrvzg8KYzSqOw tools/xend-old/xend
  403a3edbrr8RE34gkbR40zep98SXbg tools/xentrace/Makefile
  40a107afN60pFdURgBv9KwEzgRl5mQ tools/xentrace/formats
  4050c413PhhLNAYk3TEwP37i_iLw9Q tools/xentrace/xentrace.8
diff --cc tools/xen/Makefile
index 852d93dc5f,8732a30932..343a596e90
--- a/tools/xen/Makefile
+++ b/tools/xen/Makefile
@@@ -12,7 -12,10 +12,9 @@@ install: al
  	fi
  	mkdir -p $(prefix)/usr/sbin
  	install -m0755 xend $(prefix)/usr/sbin
 -	install -m0755 netfix $(prefix)/usr/sbin
  	install -m0755 xm $(prefix)/usr/sbin
+ 	mkdir -p $(prefix)/etc/xen/xend
+ 	install -m0755 vifctl $(prefix)/etc/xen/xend
  
  clean:
  	rm -rf build *.pyc *.pyo *.o *.a *~